Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 22 Jan 2010 14:50:35 +0000 (14:50 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 22 Jan 2010 14:50:35 +0000 (14:50 +0000)

Trivial merge